Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 16 Mar 2010 00:21:21 +0000 (00:21 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 16 Mar 2010 00:21:21 +0000 (00:21 +0000)

Trivial merge